Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 15 Feb 2012 18:04:22 +0000 (10:04 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 15 Feb 2012 18:04:22 +0000 (10:04 -0800)
commit467d9fc8f0bb9fd6e755e9a6def9959ccce53e02
treed969a13ace23e4414372c96adbca3a10740ba6e9
parenta61937ebb2ec67a265d1f87fbff5cbca1445db7c
parent528ab39182a23ccaeb7598a36239ebacad352a02
Merge from trunk.